Auto merge of #4180 - pnkfelix:issue-4135, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 21 Jun 2017 12:11:25 +0000 (12:11 +0000)
committerbors <bors@rust-lang.org>
Wed, 21 Jun 2017 12:11:25 +0000 (12:11 +0000)
commitd23510c7e5a4808618041ae1850c8ba93ebca698
tree332642d3616f252e67d72562cb92418278a5a542
parent402d8454f86e514fa00e4f13f051f08620d6a9a7
parent749ec6ec20f2675dcb1db1217f33e3772bfbd7d9
Auto merge of #4180 - pnkfelix:issue-4135, r=alexcrichton

Issue 4135: include = [...] should override git file list

Fix #4135: if theres `include = [...]`, then do not prepopulate file list via git.